bitkeeper revision 1.211 (3eb92435Me0VsFGKxdrtpCw31sPWBw)

add "make install" target to install boot and binary files in
install/boot and install/bin as appropriate

diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 9cc9e724e8d6ddb785da2c95d66c6239ee914889..589492e6122e67bc66a84502c171e1e1f3fcbec4 100644 (file)
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -6,6 +6,7 @@ akw27@labyrinth.cl.cam.ac.uk
 akw27@plucky.localdomain
 bd240@boulderdash.cl.cam.ac.uk
 bd240@labyrinth.cl.cam.ac.uk
+iap10@freefall.cl.cam.ac.uk
 iap10@labyrinth.cl.cam.ac.uk
 jws22@gauntlet.cl.cam.ac.uk
 jws@cairnwell.research

diff --git a/Makefile b/Makefile
index 9f25d7134ef4a5a73de57cb002def5117a26535b..f80a30c946a6ea86fbe3df0c05106793028ffb53 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,6 +25,15 @@ all:
        $(MAKE) -C tools/internal
        $(MAKE) -C tools/vdmanager
 
+install: all
+       $(MAKE) -C xen install
+       $(MAKE) -C tools/balloon install
+       $(MAKE) -C tools/domain_builder install
+       $(MAKE) -C tools/domctl install
+       $(MAKE) -C tools/internal install
+       $(MAKE) -C tools/vdmanager install
+
+
 clean:
        $(MAKE) -C xen clean
        $(MAKE) -C tools/balloon clean

diff --git a/tools/balloon/Makefile b/tools/balloon/Makefile
index 49bab90077e9be6a0eee736aa832473b5f49cd0d..dd88eab72a7d2b99b20bd8f6e9b4c3c8c02c0fed 100644 (file)
--- a/tools/balloon/Makefile
+++ b/tools/balloon/Makefile
@@ -1,9 +1,12 @@
 CC = gcc
 TARGET=balloon
 
-TARGET: balloon.c
+$(TARGET): balloon.c
        $(CC) -O2 -Wall -o $(TARGET) balloon.c
 
+install: $(TARGET)
+       cp  $(TARGET) ../../../install/bin
+
 clean:
        $(RM) *.o $(TARGET) *~
 

diff --git a/tools/domain_builder/Makefile b/tools/domain_builder/Makefile
index 6707481f1b7c3939c6d161ffb58e304afed06ee4..4e54fd4f4eed413c665d3bfe3c063c402fc304f2 100644 (file)
--- a/tools/domain_builder/Makefile
+++ b/tools/domain_builder/Makefile
@@ -6,6 +6,9 @@ all: dom_builder.o dom_kill.o
        $(CC) -o $(BUILDER) dom_builder.o
        $(CC) -o $(KILL) dom_kill.o
 
+install: all
+       cp domain_builder kill_domain ../../../install/bin
+
 dom_builder.o: dom_builder.c dom0_defs.h dom0_ops.h hypervisor_defs.h mem_defs.h
        $(CC) -c dom_builder.c 
 

diff --git a/tools/domctl/Makefile b/tools/domctl/Makefile
index 9916d82d1fda0a78a98a53d786965c449389186d..951b7468b24bd826f9e7c31a9f1c62b125a50676 100644 (file)
--- a/tools/domctl/Makefile
+++ b/tools/domctl/Makefile
@@ -1,6 +1,9 @@
 default:
        ant dist
 
+install: default
+       cp domctl.jar domctl ../../../install/bin
+
 clean:
        ant clean
        rm -f domctl.jar

diff --git a/tools/internal/Makefile b/tools/internal/Makefile
index d2e19221d13a98370bf81522f42b7dc37f39bb59..b695595455b6cd41d0198643e08516dfe19d50a5 100644 (file)
--- a/tools/internal/Makefile
+++ b/tools/internal/Makefile
@@ -27,6 +27,9 @@ $(XI_STOP).o: $(XI_STOP).c dom0_defs.h dom0_ops.h hypervisor_defs.h mem_defs.h
 $(XI_DESTROY).o: $(XI_DESTROY).c dom0_ops.h dom0_defs.h
        $(CC) -c $(XI_DESTROY).c 
 
+install: all
+       cp -a $(XI_CREATE) $(XI_BUILD) $(XI_START) $(XI_STOP) $(XI_DESTROY) ../../../install/bin
+
 clean:
        $(RM) *.o $(XI_CREATE) $(XI_START) $(XI_STOP) $(XI_DESTROY) $(XI_BUILD)
 

diff --git a/tools/vdmanager/Makefile b/tools/vdmanager/Makefile
index 14f6eeb91b9124d719a4b7bd89105479a8aaffb4..ddb8f0c9efbe39f312498ac5001fd0b41c6fb777 100644 (file)
--- a/tools/vdmanager/Makefile
+++ b/tools/vdmanager/Makefile
@@ -1,6 +1,9 @@
 default:
        ant dist
 
+install: default
+       cp -a vdmanager vdmanager.jar ../../../install/bin
+
 clean:
        ant clean
        rm -f vdmanager.jar

diff --git a/xen/Makefile b/xen/Makefile
index d12aaf84d6142ad60bd2cd7d0d6fd57e896f2542..e9d1bcb0f6bfffa89a037d1d1b648bb451fdb5fa 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -19,7 +19,7 @@ debug:
 
 install: $(TARGET)
        gzip -f -9 < $(TARGET) > $(TARGET).gz
-       cp $(TARGET).gz ../../install/images/image
+       cp $(TARGET).gz ../../install/boot/
 
 clean: delete-links
        $(MAKE) -C tools clean

diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile b/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
index 557fe98217a9426bdaba4fa44bc34c76b22a9ed3..534c4a4606c42e4f82f163b131707a2193101aad 100644 (file)
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/Makefile
@@ -89,6 +89,9 @@ FORCE: ;
 bzImage: vmlinux
        @$(MAKEBOOT) image.gz
 
+install: bzImage
+       cp -a arch/$(ARCH)/boot/image.gz ../install/boot/xenolinux.gz
+
 archclean:
        @$(MAKEBOOT) clean